Obtain the background color from the gc when it is needed. (#331820)

2006-02-20  Matthias Clasen  <mclasen@redhat.com>

	* gdk/gdkgc.c (_gdk_gc_update_context): Obtain the
	background color from the gc when it is needed.  (#331820)

diff --git a/ChangeLog b/ChangeLog
index 04ec08cbadcef92de07d26fff8bc1ddc348be519..5589ba333fa13412f90827521fe7aafd126a0106 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-20  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/gdkgc.c (_gdk_gc_update_context): Obtain the
+       background color from the gc when it is needed.  (#331820)
+
 2006-02-19  Matthias Clasen  <mclasen@redhat.com>
 
        * gdk/gdkgc.c (_gdk_gc_update_context): Add a gc_changed

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 04ec08cbadcef92de07d26fff8bc1ddc348be519..5589ba333fa13412f90827521fe7aafd126a0106 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-02-20  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/gdkgc.c (_gdk_gc_update_context): Obtain the
+       background color from the gc when it is needed.  (#331820)
+
 2006-02-19  Matthias Clasen  <mclasen@redhat.com>
 
        * gdk/gdkgc.c (_gdk_gc_update_context): Add a gc_changed

diff --git a/gdk/gdkgc.c b/gdk/gdkgc.c
index 066f0c57d12d78f4d9d7a34be48c6a9c4c06ea2b..664d5a03cc81b01e38caca0a237f265aa7ab3b4d 100644 (file)
--- a/gdk/gdkgc.c
+++ b/gdk/gdkgc.c
@@ -1152,12 +1152,8 @@ _gdk_gc_update_context (GdkGC     *gc,
     }
 
   if (fill == GDK_OPAQUE_STIPPLED)
-    {
-      if (override_foreground)
-       foreground = *override_foreground;
-      else
-       gc_get_background (gc, &background);
-    }
+    gc_get_background (gc, &background);
+
 
   switch (fill)
     {